Finish editing DDD after review v.1.2 final