some more enhancements