Added orientation control