merging in sweep-refactor