Compliant production environment. close #6