Added straight, pairs logic