refactored for deploying to openshift