Modified Calculator