Change to improve Audio Class