some changes, after testing all the services