Fix Sound Control and Disable for now

Needs some more workaround