Added some more highlighting