Update upstream

...to highlight function to make it more readable