improvement edit mode