Added some extra highlighting