API changes, performance improvement, a test script