services and controller modifications