Apparently my merge with Maria removed Jonathan's changes.  So I am
adding his changes back in.