Replaced last few Features with new style features in commands