Some rearranging and stuff