Update to 2.5