0.0.7: code rewrited