Make features independent.
2 files changed