Better 'surprise' orientation handling