rearranged a few things