Change to use custom comment system