Second attempt at Sweep2Lock complete