Updated index for highlighting