Changes to accommodate user test results.