More updates to PM rate calculation.