update service and controller and test for it WIP