Update to version 2.5