V16.2.1, improved performance