Round two of prep for #saratoga200k cc: @lobotims_tan