added no sound
resolved merged confilcts