Removed unnecessary comment (again -_-), added P1->P2 changes