reorder methods
bugfix: order changes on load