Commented out audio, added switch