Revert "Huge Update"

This reverts commit 9bd8c07273f891b1cbccca6d5ef9765db12e3c28.