Progress on highlight #62