updated simplecalculator