ENH More thoughts