finished the first try of 1.7