CSIT-390 Replace rate calculation II