incorporate guglielmo's json update from pull request