Revert "Big update"

This reverts commit 0bf596061d317509699d70a457a7a366ed3e5f41.