rolled back without figures 2 and 3