Changed figure order