update to latest 2.5 changes