New re-rewritten version.
To be enhanced from there.