Finish implementation of highlights.