Added auto_orient