updated PIII,p1, more or less finished p2