Some refactioring done, play sound functionality changed