rearranging some more