Little Change to SoundHandler :)