Edition with comments