Big update

Explained at the commit