Updated rate calculations