rearranging some stuff