Highlighting now added, appears to be working properly