Updated for calculator