Huge update
Revert "Huge update"

This reverts commit d476655c9e2f58009a83ae7a668905e5b5056863.