rearranged methods

git is crazy