Revert "More updates"

This reverts commit 657eb9c97750217d9806b6ec7b4a3ed5fd7cadf9.
Roll back

Did not intend my branch to affect the master one.