just rearranging some code