Add features from ashley's class