Re-commit with scenarios