Updated to work with changes to rates