revised the feature set to keep  up with some constraints