changed so some services don't get redeclared.