3line

After manual merging...