Updates to commenting flow