updated Calculator