final changes before re-submitting.  Including Jocelyn's changes