Working on comments edit