Final update in v0.0.1