Added MDMA and tweaked progression