Added custom highlighting code