working on the v0.3.0