rearranged some lines to make it all more standard