Revert "Updated almost everything"

This reverts commit e8db612f68eabdb76f73faa6a43f544261885d79.