update from 1.5/1.6 to 1.6/1.7