minor refactoring to which sound to play, and when to play it.