Updated comment system.