Sorry!

merge took out Jon’s updates.  Putting back manually.