Use original order controller since it is not using resource controller
Moved some stuff around