Refactored and added sounds