Still handling the device orientation