Rearranged and renamed methods