PP review and fixs