v1.1 refactoring