a little rearranging