Changed figure number, moved class