Updates during review with Kenton.