almost done rearranging