Changed the feature somewhat