Line handling (33/38)

Line handling