Swc 1696 d

John, please use descriptive names here, not "step2"