some rearranging.