Added sound
Resolved merge conflicts