* enhancements