Line handling (25/38)

Line handling