A step closer to round-trip editing