Rearrange new methods to minimalize diffs.