added AVR to class switch