Added old calc support