MDMA and MDMR added