re-commit from hjm