Refactored highlights