reworking straight finding logic