Changes to the way rate is handled