added better highlighting using regex