Reordered methods to make more sense.