7.2.2 enhancements