Added in re-entry rates, changed order