reorganization, added sound