Enhancements and more general.