Finish coding v0.1