new calc changes
fixed merge conflicts