more calc updates