added better highlighting