refining v0.1.2