Round two of #saratoga200k prep. Cc: @lobotims_tan