v1.0.1 refactoring