Updated the basic features
Fixing a confict