Back to a iso functionnal package, only rewritten; More to come
Refactored with same functionnality