Bring sanhw1 up to date