refactor draft order method