adding backfilling logic