updated to new highlighting thing