made the feature steps a bit more generic