new files for remove PQ to just 2020 and minor tweak