Update based upon what Dan found in QA.