Line handling (36/38)

Line handling