Update to version 2.16