Added the default randomized structure, and renamed the sweepline version