Added types, Harden pp