Start clean up, added rem mixing