Refactor #remix
Track which map a remix came from