just some rearranging