added all features back