Revert "Final Update"

This reverts commit f02a4fd1010694e67a2f373a6d11711e303be996.