changed some things for P2