added rates
merge conflict