Sweep code moved