Sounds replaced and reorganized