Revert "Revert "MEGA UPDATE!!!""

This reverts commit 16b7c2b6aa00e1a277537d2498d036b1c5391186.