re-commit attempt #1