changes to services, reverting deptId requirement
Fixed conflicts