Enhancements to the enhancements