0.0.6
Rewrite a bit