impove the VIEW_ADD_MODIFY branch