Added sounds
Merged conflicts