More settings about PPS
Moved back old code