moving to 1.7