diff --git a/subgraphs/saucerswap/v2/.eslintrc b/subgraphs/saucerswap/v2/.eslintrc
new file mode 100644
index 0000000..aefd19c
--- /dev/null
+++ b/subgraphs/saucerswap/v2/.eslintrc
@@ -0,0 +1,6 @@
+{
+    "parser": "@typescript-eslint/parser",
+    "plugins": ["@typescript-eslint"],
+    "extends": ["plugin:@typescript-eslint/recommended", "prettier", "prettier/@typescript-eslint"]
+  }
+  
\ No newline at end of file
diff --git a/subgraphs/saucerswap/v2/.gitignore b/subgraphs/saucerswap/v2/.gitignore
index 0da354a..466fe2a 100644
--- a/subgraphs/saucerswap/v2/.gitignore
+++ b/subgraphs/saucerswap/v2/.gitignore
@@ -2,4 +2,4 @@ build/
 node_modules/
 src/types/
 .DS_STORE
-yarn-error.log
\ No newline at end of file
+yarn-error.log
diff --git a/subgraphs/saucerswap/v2/.prettierrc b/subgraphs/saucerswap/v2/.prettierrc
new file mode 100644
index 0000000..96154a7
--- /dev/null
+++ b/subgraphs/saucerswap/v2/.prettierrc
@@ -0,0 +1,6 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "printWidth": 120
+  }
+  
\ No newline at end of file
diff --git a/subgraphs/saucerswap/v2/subgraph.yaml b/subgraphs/saucerswap/v2/subgraph.yaml
index 87ece51..c1c20d9 100644
--- a/subgraphs/saucerswap/v2/subgraph.yaml
+++ b/subgraphs/saucerswap/v2/subgraph.yaml
@@ -5,18 +5,18 @@ schema:
   file: ./schema.graphql
 features:
   - nonFatalErrors
-  - grafting
-graft:
-   base: QmSbSQfqGc74us3HuEdyZmktsg4eLmpwrSePvZaU1NgcgB
-   block: 56520780
+# Grafting is useful when you want to start a new subgraph from a specific block in the past of an existing subgraph indexed data, this is useful for quick fixes without having to re-index everything from scratch.
+#   - grafting
+# graft:
+#    base: QmSbSQfqGc74us3HuEdyZmktsg4eLmpwrSePvZaU1NgcgB
+#    block: 56520780
 dataSources:
   - kind: ethereum/contract
     name: Factory
     network: mainnet
     source:
       address: '0x00000000000000000000000000000000003c3951' 
-      abi: Factory
-      #startBlock: 55651154
+      abi: Factory      
       startBlock: 55651154
     mapping:
       kind: ethereum/events
@@ -45,8 +45,7 @@ dataSources:
     network: mainnet
     source:
       address: '0x00000000000000000000000000000000003ddbb9'
-      abi: NonfungiblePositionManager
-      # startBlock: 56514876 
+      abi: NonfungiblePositionManager      
       startBlock: 56514876
     mapping:
       kind: ethereum/events