Adding functionnality for highlight