v 1.0.0.0 refactoring v0.6