Added recalculation