rearranging some things