Updated gna/gk for p1, started p2