Added diffs from refactor.