rearranged some lines whatever