Calculator updates 2