more p.a.m 2.x changes