Rearranged some methods