Offline sweeping idea from @kkaushik added TODO