Better line finding