Added sound handling