Updated to v1.7