rewrite some comment and update handler