rearranging all the stuff