Calc improwments