bring up to date with 2.6 in prep for 3.0 changes