Small changes
Merge branch 'highlight' into testing