Switch is working again - classes names changed