modif to v0.1.2