agreed. It should be a different feature file