Refactored Highlight