added various enhancements