updates and enhancements