Almost done with v1.7~