Refactor/version1.0