fix hilight WIP