Fixed the sound
refactoring + soundfix