Changes from PP review