rearranging stuff a bit.