Line handling (34/38)

Line handling