P2 as starting point, made corrections