Updated auto sweeping