Works! at last...
some old stuff removed