Rearranged some methodes