some changes in the service