Reworks of the classes