reorder methods to be in sync with master branch