Fixing ordering
Merge branch 'highlight' into testing