Added device orientation and watch for heading