1.7 updates etc.