added sound
fixed merge conflicts