Revert "BIG UPDATE"

This reverts commit 7ede295a5ff1e44b417b422c7871a3e14ecd2aa9.