merge prep
sound handling change, deleted old code