Updated order controller