started to fix on the editing action part