Updated demo calculator