Merge Refactor to Dev