Refactor p1
Refactor p1
Complete h1p2