added all of the features