improved higlighting