more changes to fact service2