Push Dr. Zhang's changes to Scott's method.