- refactoring for 1.1 version