Calc

more updates