Update to the controller for performance, updated docs