rearranged things a bit