Sync to calculator v3.0