few more enhancements..