revert to original version
cleanup
playsound fixed
merged