change to NAMESPACE and high risk strategy