Enhancements and more function compatibility