merged new Oculus classes