chang classes according to the new format