Added calc to p1