Update to Hyde's latest code