Revert "Revert "Merged new simulator with sound bug fixed.""

This reverts commit 5bc0781ce4e67b507bc5591a4a6e8e81b819f491.