Update to comment system