V 2.0 With edit interface