Just reordered some methods.