Added (hopefully) direct rate calculator