re-ecriture du core v0.2