modif to v0.2.5