Updating George PR #3239