Adapted to changed OrderController