Modified Calculator for testing