reworking calc