Changes to sound engine - incomplete