Tried to improve sample highlighting.