Updated to v 1.7