Added AUD and implemented a switch