added some more enhancements