added no sound
resolved merge conflicts