Portal order refactored