first try of #12
working in Enh #7