reorder methods for consistency