partially revert make more editable