Reordered some methods