Add highlights, rebuild with new design