40-commit changes