PPA-Update

Modifications after testing of previous PPA-UPDATE da7500bab6d0932011b4cb72c61e05828f286f3d