Final changes to 2.5