Final 2.5 update