PVP compliance
started work on fixing this up for 7.8.1