In progress highlight improvement