hopefully committing JH's changes to these files!