more rearranging