菜单
Update project changelog with uncommitted changes, synchronize package versions, and create version releases with automatic commit, conditional git tags, GitHub Releases, and push
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | changelog-manager |
| description | Update project changelog with uncommitted changes, synchronize package versions, and create version releases with automatic commit, conditional git tags, GitHub Releases, and push |
| version | 2.8.0 |
| author | Claude Code |
| tags | ["changelog","versioning","git","release-management","package-management","git-tags","conditional-tagging","readme-automation","docs-automation","git-guard","auto-intercept","github-releases","explicit-workflow","verification-checklist"] |
| auto-activate | true |
This skill AUTOMATICALLY activates when Claude detects ANY of these keywords or phrases:
CRITICAL: Use MINIMAL colored output (2-3 calls max) to prevent screen flickering!
Example formatted output (MINIMAL PATTERN):
# START: Header only
bash .claude/skills/colored-output/color.sh skill-header "changelog-manager" "Analyzing changes for release..."
# MIDDLE: Regular text (no colored calls)
Detected version bump: v1.8.1 → v1.8.2
Updated 5 files
- CHANGELOG.md updated
- package.json updated
- README.md badge updated
Creating release v1.8.2...
# END: Result only
bash .claude/skills/colored-output/color.sh success "" "Release v1.8.2 complete!"
DO Use:
bash .claude/skills/colored-output/color.sh skill-header "changelog-manager" "Starting..."bash .claude/skills/colored-output/color.sh success "" "Release complete!"bash .claude/skills/colored-output/color.sh error "" "Git command failed"DON'T Use:
WHY: Each bash call creates a task in Claude CLI, causing screen flickering. Keep it minimal!
When this skill auto-activates (user says trigger keywords), Claude MUST:
<command-message>The "changelog-manager" skill is running</command-message>\033[1;34m🔧 [changelog-manager]\033[0mExample of CORRECT behavior:
User: "release update"
Claude: [Skill auto-activates]
Claude: "I'll analyze your changes and prepare the release."
Claude: [Proceeds with git status, git diff, version detection...]
Example of INCORRECT behavior (DO NOT DO THIS):
User: "release update"
Claude: [Skill auto-activates]
Claude: "Would you like me to use changelog-manager?" ❌ WRONG - Don't ask!
User: "yes"
Claude: [Manually invokes skill again] ❌ WRONG - Skill already running!
Why this matters:
CRITICAL: This skill automatically intercepts git commands to prevent bypassing proper release workflow!
Intercepts BEFORE executing:
git commit command (when release indicators detected)git tag command (always intercepts)git push command (when unpushed release-like commits exist)Detection Logic: When Claude attempts a git command, automatically check for release indicators:
Analyze Changes:
git diff --cached --name-only # What's staged
git diff --name-only # What's uncommitted
Detect Release Indicators:
Extract Version Info (if version file changed):
# Old version vs new version
git diff skill.md | grep "version:"
# Example: -version: 2.4.0 / +version: 2.5.0
Block Command & Ask User:
🛡️ GIT COMMAND INTERCEPTED
Detected: changelog-manager/skill.md
Version: 2.4.0 → 2.5.0
Changes:
- .claude/skills/changelog-manager/skill.md (version bump)
- generic-claude-framework/skills/changelog-manager/skill.md
- CHANGELOG.md (unreleased section)
⚠️ This looks like a release!
Options:
1. Use changelog-manager for proper release workflow
✅ Auto-generates CHANGELOG entry
✅ Updates README badges
✅ Runs documentation generation
✅ Creates commit + tag + pushes everything
2. Proceed with manual git commit
⚠️ Skips release automation
Which do you prefer? (say "use changelog-manager" or "proceed manually")
Wait for User Decision:
This prevents accidentally bypassing changelog-manager, even when Claude works autonomously!
When activated, changelog-manager will:
No manual invocation needed! Skill auto-activates on keywords OR git command attempts.
Git tags are CONDITIONAL based on project type:
Why tags are essential here:
Why tags may not be needed:
Auto-detect project type by checking:
# 1. Check if remote is public GitHub
git remote -v | grep "github.com" && check if repo is public
# 2. Check for package registry files
- package.json with "private": false → Public npm package → USE TAGS
- composer.json with public packagist → USE TAGS
- pyproject.toml with PyPI config → USE TAGS
# 3. Check repository visibility
- GitHub API: Check if repo.private === false → USE TAGS
- GitLab/Bitbucket: Check visibility settings
# 4. Ask user if unclear
"This appears to be a [public/private] project. Should I create git tags for releases? (Y/n)"
| Project Type | Git Tags | Example |
|---|---|---|
| Public GitHub repo | ✅ YES | Open-source framework (this repo) |
| Published npm package | ✅ YES | React library on npm registry |
| Public composer package | ✅ YES | Laravel package on Packagist |
| Private client project | ❌ NO | Custom website for client |
| Internal SaaS | ❌ NO | Company's private application |
| Prototype/experiment | ❌ NO | Testing new architecture |
| Unclear/ambiguous | ❓ ASK | User confirms preference |
A comprehensive skill for managing project changelogs, package version synchronization, semantic versioning, and automated release workflows.
If no specific command is provided, show this menu:
📋 Changelog Manager - Interactive Mode
=======================================
🚀 What would you like to do?
🔹 Option 1: Update Changelog with Uncommitted Changes
Usage: /changelog-manager "update changelog"
Usage: /changelog-manager "prepare release"
Analyzes uncommitted changes and updates changelog with new version
🔹 Option 2: Create Specific Version
Usage: /changelog-manager "release v1.2.4"
Usage: /changelog-manager "major release" (bumps to next major version)
Usage: /changelog-manager "minor release" (bumps to next minor version)
Creates specific version with custom entries
🔹 Option 3: Review Current Changes
Usage: /changelog-manager "review changes"
Shows what would be added to changelog without committing
📝 Version Types:
• Patch (default): Bug fixes and minor improvements (1.2.3 → 1.2.4)
• Minor: New features, non-breaking changes (1.2.3 → 1.3.0)
• Major: Breaking changes, major updates (1.2.3 → 2.0.0)
💡 Examples:
• /changelog-manager "I've finished the new subscription filtering feature, update changelog"
• /changelog-manager "Ready to release v1.5.0"
• /changelog-manager "Review what changes would be included"
🔒 Security & Privacy:
========================
✅ Automatically filters out admin/backend changes
✅ Excludes technical implementation details
✅ Only includes user-facing improvements
✅ Removes sensitive information from changelog
⚙️ Workflow:
========================
1. 📊 Analyze uncommitted git changes
2. 🔍 Filter out admin/internal changes
3. 📝 Generate user-friendly changelog entries
4. 📈 Determine version increment (patch/minor/major)
5. ✍️ Update CHANGELOG.md
6. 📦 Update package.json version
7. 📦 Update composer.json version (if exists)
8. 💾 Commit ALL changes (including updated package files)
9. 🚀 Push to remote repository
This skill automates the complete changelog update and version release process for SubsHero, ensuring:
Automatically excludes from public changelog:
Only includes in changelog:
CRITICAL: Version Alignment Across All Package Files
After updating CHANGELOG.md, the skill MUST update package version numbers to maintain consistency.
Important Notes:
Automatic Badge & Release Section Synchronization
After updating version in CHANGELOG.md and package.json, update README.md:
[]Example:
# Before
[](CHANGELOG.md)
# After
[](CHANGELOG.md)
Automatic Count Calculation:
Count actual agents and skills in framework directories:
# Count agents (directories in generic-claude-framework/agents/)
AGENT_COUNT=$(find generic-claude-framework/agents -maxdepth 1 -type d ! -name agents | wc -l)
# Count skills (directories in generic-claude-framework/skills/)
SKILL_COUNT=$(find generic-claude-framework/skills -maxdepth 1 -type d ! -name skills | wc -l)
Update badges with calculated counts:
# Before
[](docs/AGENT_CATALOG.md)
[](docs/SKILL_CATALOG.md)
# After (if counts changed)
[](docs/AGENT_CATALOG.md)
[](docs/SKILL_CATALOG.md)
Why Auto-Calculate?
Create "Latest Release" Section:
Insert after badges, before main content (after line with badges, before "## 🎯 What is This?"):
<details open>
<summary><b>📦 Latest Release: v1.7.0 (2025-10-22)</b></summary>
### Added
- cli-modern-tools Skill v1.1.0 with automatic command replacement
- New cli-wrapper.sh script for auto-detection and fallback
- Auto-replaces: cat→bat, ls→eza, find→fd, tree→eza --tree
### Changed
- Documentation generator now supports selective updates
- New flags: --skill <name>, --agent <name>, --catalogs-only
[View Full Changelog →](CHANGELOG.md)
</details>
Extraction Logic:
## [X.X.X] - YYYY-MM-DD and next ##<details> blockBenefits:
Automatic Agent/Skill Documentation Updates
Before committing, intelligently regenerate documentation for changed agents/skills:
Detection Logic:
# Detect changed agent files
CHANGED_AGENTS=$(git diff --name-only --cached | grep "generic-claude-framework/agents/.*/agent.md" | sed 's|generic-claude-framework/agents/\(.*\)/agent.md|\1|')
# Detect changed skill files
CHANGED_SKILLS=$(git diff --name-only --cached | grep "generic-claude-framework/skills/.*/skill.md" | sed 's|generic-claude-framework/skills/\(.*\)/skill.md|\1|')
Selective Documentation Generation:
If agent files changed:
for agent in $CHANGED_AGENTS; do
python scripts/generate_docs.py --agent "$agent"
done
If skill files changed:
for skill in $CHANGED_SKILLS; do
python scripts/generate_docs.py --skill "$skill"
done
Always update catalogs (to reflect new counts):
# Catalogs are auto-updated by selective generation
# They include updated counts and links
What Gets Regenerated:
generic-claude-framework/agents/<agent-name>/README.mdgeneric-claude-framework/skills/<skill-name>/README.mddocs/AGENT_CATALOG.md and docs/SKILL_CATALOG.mdBenefits:
Example Flow:
User: "Prepare release v1.8.0"
Detected changes:
- generic-claude-framework/skills/cli-modern-tools/skill.md (modified)
Actions:
1. Update CHANGELOG, package.json, README badges
2. Run: python scripts/generate_docs.py --skill cli-modern-tools
→ Regenerates: cli-modern-tools/README.md
→ Updates: SKILL_CATALOG.md, AGENT_CATALOG.md
3. Stage all updated files
4. Commit + tag + push
Result: All documentation automatically synchronized!
Complete Release Workflow:
Stage All Changes
# Stage release files
git add CHANGELOG.md package.json README.md [composer.json if exists]
# Stage generated documentation (if any)
git add docs/AGENT_CATALOG.md docs/SKILL_CATALOG.md
git add generic-claude-framework/agents/*/README.md
git add generic-claude-framework/skills/*/README.md
Create Comprehensive Commit
git commit -m "Release vX.X.X - [Brief summary]
## Version X.X.X
Updated CHANGELOG.md, package.json, and README.md to reflect version X.X.X.
### Highlights
[Key changes from changelog]
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>"
Create Git Tag
git tag -a vX.X.X -m "Release vX.X.X - [Brief summary]"
Push to Remote
git push origin main && git push origin vX.X.X
Create GitHub Release
# Extract release notes from CHANGELOG.md for this version
# Use gh CLI to create formatted GitHub Release
gh release create vX.X.X \
--title "Release vX.X.X - [Brief summary]" \
--notes "$(cat <<'EOF'
[Extract content from CHANGELOG.md for this version]
See [CHANGELOG.md](CHANGELOG.md) for full details.
EOF
)"
Verify Success
⚠️ CRITICAL: Follow EVERY step below. NO steps can be skipped!
When user says: "update changelog" or "prepare release"
🔧 BASH COMMAND ATTRIBUTION PATTERN:
CRITICAL: Before executing EACH bash command, MUST output:
🔧 [changelog-manager] Running: <command>
MUST RUN ALL THREE COMMANDS WITH ATTRIBUTION:
Announce: 🔧 [changelog-manager] Running: git status
Execute: git status to find uncommitted changes
Announce: 🔧 [changelog-manager] Running: git diff --stat
Execute: git diff --stat to see file change summary
Announce: 🔧 [changelog-manager] Running: git log --oneline -5
Execute: git log --oneline -5 to see recent commit patterns
Output to user: Summarize what files changed (X files modified, Y additions, Z deletions)
MUST analyze changes and decide version bump type:
Automatic Detection Rules:
MAJOR bump (X.0.0) if:
MINOR bump (X.Y.0) if:
PATCH bump (X.Y.Z) if:
Read current version from CHANGELOG.md (top version number)
Calculate new version (e.g., 1.9.0 → 1.10.0 for MINOR)
Output to user: "Current version: X.Y.Z → New version: X.Y.Z (MINOR release)"
MUST create comprehensive changelog entry:
Structure:
## [X.X.X] - YYYY-MM-DD
### Added
- [New features based on git diff analysis]
### Changed
- [Modifications based on git diff analysis]
### Fixed
- [Bug fixes based on git diff analysis]
### Documentation
- [Documentation updates]
Content Analysis:
Output to user: Show draft changelog entry for review
MUST update ALL version files (no exceptions):
4.1 Update CHANGELOG.md:
[Unreleased]: https://github.com/USER/REPO/compare/vX.X.X...HEAD
[X.X.X]: https://github.com/USER/REPO/compare/vX.Y.Z...vX.X.X
4.2 Update package.json:
4.3 Update README.md:
[](CHANGELOG.md)4.4 Update composer.json (if exists):
test -f composer.jsonOutput to user: "Updated 3-4 version files: CHANGELOG.md, package.json, README.md [, composer.json]"
⚠️ MANDATORY STEP - This step was previously missed!
MUST run documentation generation script WITH ATTRIBUTION:
🔧 [changelog-manager] Running: python scripts/generate_docs.py
Execute: python scripts/generate_docs.pyThis script:
Check if documentation was generated WITH ATTRIBUTION:
🔧 [changelog-manager] Running: git status --short | grep -E "(README.md|CATALOG.md)"
Execute: git status --short | grep -E "(README.md|CATALOG.md)"Expected output: 20-30 documentation files updated
Output to user: "Generated documentation: X agent READMEs, Y skill READMEs, 2 catalogs updated"
If script fails: Report error and ask user how to proceed
MUST determine if git tags should be created:
Auto-Detection Process:
# 1. Check package.json for "private" field
PRIVATE=$(cat package.json | grep '"private": true')
# 2. Check git remote for public GitHub
GITHUB_PUBLIC=$(git remote -v | grep "github.com")
# 3. Decision logic
if [[ -z "$PRIVATE" && -n "$GITHUB_PUBLIC" ]]; then
USE_TAGS=true # Public GitHub repo → Use tags
else
USE_TAGS=false # Private/internal → Skip tags
fi
Ask user if unclear:
"This project appears to be [public/private]. Should I create git tags for this release? (Y/n)"
Output to user: "Project type: [public/private] → Git tags: [enabled/disabled]"
MUST stage ALL modified files:
git add -A
This includes:
Verify staging WITH ATTRIBUTION:
Announce: 🔧 [changelog-manager] Running: git status --short
Execute: git status --short
Output to user: "Staged X files for commit"
MUST create comprehensive commit message:
git commit -m "$(cat <<'EOF'
Release vX.X.X - [Brief Summary]
## Version X.X.X
Updated CHANGELOG.md, package.json, README.md, and auto-generated documentation to reflect version X.X.X.
### Highlights
[Top 3 changes from changelog]
### Files Updated
- CHANGELOG.md (added vX.X.X entry)
- package.json (X.Y.Z → X.X.X)
- README.md (version badge updated)
- Documentation: X agent READMEs, Y skill READMEs, 2 catalogs
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
EOF
)"
Verify commit WITH ATTRIBUTION:
Announce: 🔧 [changelog-manager] Running: git log -1 --oneline
Execute: git log -1 --oneline
Output to user: "Created commit: [commit hash] Release vX.X.X"
IF git tags enabled (public project):
git tag -a vX.X.X -m "Release vX.X.X - [Brief Summary]"
Verify tag:
git tag -l vX.X.X
Output to user: "Created tag: vX.X.X"
IF git tags disabled (private project):
MUST push commit and tag (if enabled):
IF git tags enabled:
git push origin main && git push origin vX.X.X
IF git tags disabled:
git push origin main
Output to user: "Pushed to origin/main [+ tag vX.X.X]"
MUST verify all steps completed:
git status # Should show "working tree clean"
Output comprehensive summary:
Success Message (Public Project with Tags):
✅ Release vX.X.X Complete!
📋 Updated Files:
- CHANGELOG.md (added vX.X.X entry)
- package.json (X.Y.Z → X.X.X)
- README.md (version badge updated)
- Documentation: X agent READMEs, Y skill READMEs, 2 catalogs
🏷️ Git Tag: vX.X.X created
🚀 Pushed to: origin/main
🔗 View Release:
https://github.com/USER/REPO/releases/tag/vX.X.X
📝 Summary:
- Added: [Count] new features
- Changed: [Count] improvements
- Fixed: [Count] bug fixes
Success Message (Private Project without Tags):
✅ Release vX.X.X Complete!
📋 Updated Files:
- CHANGELOG.md (added vX.X.X entry)
- package.json (X.Y.Z → X.X.X)
- README.md (version badge updated)
- Documentation: X agent READMEs, Y skill READMEs, 2 catalogs
🚀 Pushed to: origin/main
📝 Summary:
- Added: [Count] new features
- Changed: [Count] improvements
- Fixed: [Count] bug fixes
💡 Note: Git tags skipped (private project)
⚠️ CRITICAL: Before reporting success, Claude MUST verify ALL items below:
git status and analyzed uncommitted changesgit diff --stat and reviewed changespython scripts/generate_docs.py (MANDATORY!)git add -Agit status --shortgit log -1 --onelinegit status (working tree clean)If ANY checkbox is unchecked, the release is INCOMPLETE!
python scripts/generate_docs.pygit add -A to stage everythinggit status --short before commitgit status shows clean after pushSuccess Message (Public Project with Tags & GitHub Release):
✅ Release v1.2.0 Complete!
📋 Updated Files:
- CHANGELOG.md (added v1.2.0 entry)
- package.json (1.1.0 → 1.2.0)
- README.md (version badge updated)
🏷️ Git Tag: v1.2.0 created
🚀 Pushed to: origin/main
📦 GitHub Release: Published
🔗 View Release:
https://github.com/USER/REPO/releases/tag/v1.2.0
📝 Summary:
- Added: [Count] new features
- Changed: [Count] improvements
- Fixed: [Count] bug fixes
Success Message (Private Project without Tags):
✅ Release v1.2.0 Complete!
📋 Updated Files:
- CHANGELOG.md (added v1.2.0 entry)
- package.json (1.1.0 → 1.2.0)
- README.md (version badge updated)
🚀 Pushed to: origin/main
📝 Summary:
- Added: [Count] new features
- Changed: [Count] improvements
- Fixed: [Count] bug fixes
💡 Note: Git tags skipped (private project)
Proactive Auto-Detection:
Claude should automatically invoke this skill when:
After Making Code Changes: User completes task and says:
Before Major Commits: User has significant uncommitted changes
User Mentions Release Intent:
Example Conversation:
User: "I've finished adding the ecosystem reference feature"
Claude: "Great! I notice you have uncommitted changes. Would you like me to:
1. Update the changelog with these changes
2. Bump the version (this looks like a minor release)
3. Create a git tag and push to GitHub?
This will create version 1.2.0 based on the ecosystem reference feature."
User: "Yes, do it"
Claude: [Automatically invokes changelog-manager skill]
→ Analyzes changes
→ Updates CHANGELOG.md with v1.2.0
→ Updates package.json to 1.2.0
→ Updates README.md badge
→ Commits all changes
→ Creates git tag v1.2.0
→ Pushes to GitHub
→ Reports success
Purpose: Prevent accidentally bypassing changelog-manager when using direct git commands.
Before ANY git commit/tag/push command executes, this guard automatically:
Scans for Release Indicators:
# Check staged changes
git diff --cached --name-only
# Look for these patterns
- 3+ files changed
- skill.md with version: X.Y.Z changed
- agent.md with version: X.Y.Z changed
- CHANGELOG.md modified
- README.md badges changed
- package.json version changed
Extracts Version Information:
# If version file detected, show old vs new
git diff skill.md | grep -E "^[-+]version:"
# Example output:
# -version: 2.5.0
# +version: 2.6.0
Blocks Command & Presents Options:
🛡️ GIT COMMAND INTERCEPTED
I detected you're about to commit changes that look like a release:
File: changelog-manager/skill.md
Version Change: 2.5.0 → 2.6.0
Files to be committed (5):
- .claude/skills/changelog-manager/skill.md (version bump detected)
- generic-claude-framework/skills/changelog-manager/skill.md
- CHANGELOG.md (unreleased changes)
- docs/SKILL_CATALOG.md
- README.md
⚠️ RECOMMENDATION: Use changelog-manager for proper release workflow
Option 1: Use changelog-manager (Recommended)
✅ Auto-generates CHANGELOG entry from git changes
✅ Updates all version references (package.json, README badges)
✅ Generates documentation for changed agents/skills
✅ Creates semantic commit message
✅ Creates annotated git tag v2.6.0
✅ Pushes commit + tag to GitHub
✅ Complete release in one command
Option 2: Proceed with manual commit (Not recommended)
⚠️ You'll need to manually:
- Update CHANGELOG.md with entries
- Update version badges in README
- Run documentation generation
- Create git tag manually
- Push tag separately
What would you like to do?
- Say "use changelog-manager" for Option 1
- Say "proceed manually" for Option 2
Waits for User Decision:
Always Intercepted:
git tag -a v... → Always assumes this is a releasegit commit when CHANGELOG.md is modifiedgit commit when skill.md/agent.md version changedgit commit when package.json version changedConditionally Intercepted:
git commit with 3+ files → Asks usergit commit with README.md badges → Asks usergit push with unpushed commits that look like releases → Asks userNever Intercepted:
git commit with single file (typo fix, WIP)git commit on feature branches (not main)git status, git diff, git log (read-only operations)git push with only documentation commitsExample 1: Version Bump Detected
You: [working autonomously, Claude bumps skill version 2.5.0 → 2.6.0]
Claude: [attempts git commit...]
Guard: 🛡️ INTERCEPTED - Version change detected
Guard: [Shows prompt with options]
You: "use changelog-manager"
Guard: ✅ Invoking changelog-manager...
changelog-manager: [runs full release workflow]
Result: Proper v2.6.0 release created
Example 2: Multiple Files, No Version
You: [changed 5 files across different features]
Claude: [attempts git commit...]
Guard: 🛡️ INTERCEPTED - 5 files changed
Guard: "This looks like a release. Use changelog-manager?"
You: "proceed manually" (it's just WIP work)
Guard: ✅ Allowing manual commit
Result: Manual commit proceeds
Example 3: Single File Change
You: [fixed typo in README]
Claude: [attempts git commit...]
Guard: [No interception - single trivial file]
Result: Direct commit allowed (fast path)
No configuration needed! The guard is always active and automatically detects release patterns.
To disable guard (not recommended):
--skip-guard flag to git commandsFor issues or questions:
AgentHero AI - Hierarchical multi-agent orchestration system with PM coordination, file-based state management, and interactive menu interface. Use when managing complex multi-agent workflows, coordinating parallel sub-agents, or organizing large project tasks with multiple specialists. All created agents use aghero- prefix.
Fetch and download images from the internet in various formats (JPG, PNG, GIF, WebP, BMP, SVG, etc.). Use when users ask to download images, fetch images from URLs, save images from the web, or get images for embedding in documents or chats. Supports single and batch downloads with automatic format detection.
Token-efficient markdown parsing, editing, and diagram generation using native CLI tools (Windows/Mac/Linux compatible)
Generate comprehensive, fact-checked SAP technical articles and configuration guides with embedded images, flowcharts, and references. Use when users request SAP documentation, how-to guides, configuration tutorials, process explanations, or technical articles on SAP topics (ECC, S/4HANA, modules like SD, MM, FI, PP, ABAP, OData APIs, archiving, etc.). Creates professional Word documents with proper formatting and web-sourced visual aids with built-in image downloading.
Guide for creating effective skills. This skill should be used when users want to create a new skill (or update an existing skill) that extends Claude's capabilities with specialized knowledge, workflows, or tool integrations.
Auto-suggest modern CLI tool alternatives (bat, eza, fd, ripgrep) for faster, more efficient command-line operations with 50%+ speed improvements