v1.6 final version