a couple of enhancements