docs and controller modifications