Rework line

See title