More work on highlighting