Highlights fixed