final changes to p1, hopefully