some rearranging/editing