more pp and rpp changes