Huge update

This update changes a lot