rearranged some things