proper calculator added