Merge Refactor branch