A cleaner version of code for audio support
This will create a new commit in order to revert the existing changes.