more work on rate calculations