update from 2.5 to 2.7