tooling enhancements