Reordered methods for readability