-- enhancements and updates