Added in-place editing (adjusts GAP3)