Refactor1.1