Updated to contain rate calculation details