Update do 1.7 version II