Rearrange some methods.