various enhancements