Line handling (32/38)

Line handling