Updated-- trying to use less figures, saved indicies for ordering each figure