edit feature - part 2

and NOT last