Implemented orientation processing earlier