more PS7 changes