to 1.6.9
some left changes.