Revert "Big Update"

This reverts commit c1f23ae656f6e442d78101358216f6427eb5a34e.