rewrite highlight; fix; update