Added new features

Deleted old features. Added new features.