rearranging stuff to make things work again