Big update

Explained detailed at the commit