Made more changes to allow for different kinds of features.