Second attempt at Sweep2Lock Complete