adding avswitch capability