Reworked magazine regexs to work better