update 1.7 to 1.8