rearranged some stuff

rearranging