edit mode 2.0