improvements and enhancements