Better line handling