Corrected tabclass code (Again)