Gone back to longer lines, as requested elsewhere.