Update to 2.25