Modified P2 Calculator