v. 0.0.1 refactoring