Update to ox6-beta1