Update to highlight 3.18