Last changes to Edit command for now