upstream enhancements