Add some more highlighting