Line handling (35/38)

Line handling