Merged Refactor1