added enhancements