Initial 1.7 update