Update Comment and Comment Demo