#4 re-added the enhancements