More upgrade stuff
Merge github.com:ajroetker/pe-testing