Changed some stuff for P2