Update after the test on Oct 17