Further work on highlighting issue