done isue #3 (base edit commands)