Reworked some sound calls