Compiled from 91003e6 - Now summary also supports highlights