rewrite

Rewrite for v0.2.0