Update

Removed some parts taht are not needed... and added some new ones.