Line handling (22/38)

Line handling