Updated highlighting