better logic for orientations; contour orientation saves