Did some rearranging