CalcUI branch integration