Updating to work with open shift