Latest changes to comment controller