rearranging and updating figures