Added draft order formatting