Added some features. Removed some others