Update calculator to v3.0