diff --git a/schema.graphql b/schema.graphql
index ba2b9d1..7736399 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -5,8 +5,3 @@ type Aavegotchi @entity {
   right: String
   back: String
 }
-
-type Stat @entity {
-  id: ID!
-  gotchiIds: [BigInt!]!
-}
diff --git a/src/constants.ts b/src/constants.ts
index 554baae..56f4746 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,4 +1,4 @@
 import { BigInt } from "@graphprotocol/graph-ts";
 
 
-export let BLOCK_SIDEVIEWS_ACTIVATED = BigInt.fromI32(20000000);
\ No newline at end of file
+export let BLOCK_SIDEVIEWS_ACTIVATED = BigInt.fromI32(21420703);
\ No newline at end of file
diff --git a/src/helper.ts b/src/helper.ts
index 65d287b..3ff0db2 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,6 +1,6 @@
 import { Address, BigInt } from "@graphprotocol/graph-ts";
 import { Contract } from "../generated/Contract/Contract";
-import { Aavegotchi, Stat } from "../generated/schema";
+import { Aavegotchi } from "../generated/schema";
 
 export function updateSvg(gotchi: BigInt): Aavegotchi | null {
     let contract = Contract.bind(Address.fromString("0x86935F11C86623deC8a25696E1C19a8659CbF95d"))
@@ -38,24 +38,3 @@ export function getOrCreateAavegotchi(gotchi: BigInt): Aavegotchi {
 
     return gotchiEntity as Aavegotchi;
 }
-
-export function updateStats(gotchi: BigInt): Stat | null {
-    let stats = Stat.load("0");
-    if(!stats) {
-        stats = new Stat("0");
-        stats.gotchiIds = new Array<BigInt>();
-    }
-
-    let gotchiIds = stats.gotchiIds;
-
-    for(let i=0; i<gotchiIds.length; i++) {
-        let gotchiId = gotchiIds[i];
-        if(gotchiId == gotchi) {
-            return null;
-        }
-    }
-
-    gotchiIds.push(gotchi);
-    stats.gotchiIds = gotchiIds;
-    return stats;
-}
\ No newline at end of file
diff --git a/src/mapping.ts b/src/mapping.ts
index 5e15be3..98a90ab 100644
--- a/src/mapping.ts
+++ b/src/mapping.ts
@@ -67,20 +67,14 @@ import {
   WearableSlotPositionsSet,
   MintPortals
 } from "../generated/Contract/Contract"
-import { Stat } from "../generated/schema";
 import { BLOCK_SIDEVIEWS_ACTIVATED } from "./constants";
-import { updateSideViews, updateStats, updateSvg } from "./helper"
+import { getOrCreateAavegotchi, updateSideViews, updateSvg } from "./helper"
 
 export function handleClaimAavegotchi(event: ClaimAavegotchi): void {
   let gotchi = event.block.number.ge(BLOCK_SIDEVIEWS_ACTIVATED) ?  updateSideViews(event.params._tokenId) : updateSvg(event.params._tokenId);
   if(gotchi != null) {
     gotchi.save();
   }
-  
-  let stats = updateStats(event.params._tokenId);
-  if(stats != null) {
-    stats.save();
-  }
 }
 
 export function handleLockAavegotchi(event: LockAavegotchi): void {}
@@ -251,14 +245,10 @@ export function handleBlock(block: ethereum.Block): void {
   }
 
   // update side views
-  let stats = Stat.load("0")!;
-  let gotchiIds = stats.gotchiIds;
-  let i=0;
-  while(i < gotchiIds.length) {
-    let gotchi = updateSideViews(gotchiIds[i]);
+  for(let i=0; i<=25000; i++) {
+    let gotchi = updateSideViews(BigInt.fromI32(i));
     if(gotchi != null) {
       gotchi.save();
     }
-    i = i+1;
   } 
 }
\ No newline at end of file
diff --git a/subgraph.yaml b/subgraph.yaml
index 3a569b2..f49affb 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -8,7 +8,7 @@ dataSources:
     source:
       address: "0x86935F11C86623deC8a25696E1C19a8659CbF95d"
       abi: Contract
-      startBlock: 11500000
+      startBlock: 21320703
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.5