lots of enhancements