Update 1.6 and some addition comments.