some modifications to calc part