new version
Revert
initial version
Another attempt.
Cleaning up ... hopefully