Added auto_orient after geometry is determined