updated Service. all function still need to be tested