Updates to 1.7