changed way to find all services