Added CalculateYield