Implemented fortify upgrade;