Now with edit comment