diff --git a/products/pluto/pluto_build/data/dcp_zoning_maxfar.csv b/products/pluto/pluto_build/data/dcp_zoning_maxfar.csv
index e639b73358..3b5b2298ce 100644
--- a/products/pluto/pluto_build/data/dcp_zoning_maxfar.csv
+++ b/products/pluto/pluto_build/data/dcp_zoning_maxfar.csv
@@ -1,87 +1,87 @@
 zonedist,Contextual,zoningdistricttype,ResDistEq,residfar,AffResFAR,facilfar,commfar,mnffar,verified
-BALL FIELD,-,-,,-,-,-,-,-,
-BPC,-,-,,-,-,-,-,-,y
-C1-6,Non-contextual,Local Retail and Service,R7-2,3.44,5.01,6.5,2,-,y
-C1-6A,Contextual,Local Retail and Service,R7A,4,5.01,4,2,-,y
-C1-7,Non-contextual,Local Retail and Service,R8,6.02,7.2,6.5,2,-,y
-C1-7A,Contextual,Local Retail and Service,R8A,6.02,7.2,6.5,2,-,y
-C1-8,Non-contextual,Local Retail and Service,R9,7.52,9.02,10,2,-,y
-C1-8A,Contextual,Local Retail and Service,R9A,7.52,9.02,7.5,2,-,y
-C1-8X,Contextual,Local Retail and Service,R9X,9,10.8,9,2,-,y
-C1-9,Non-contextual,Local Retail and Service,R10,10,12,10,2,-,y
-C1-9A,Contextual,Local Retail and Service,R10A,10,12,10,2,-,y
-C2-6,Non-contextual,Local Retail and Service,R7-2,3.44,5.01,6.5,2,-,y
-C2-6A,Contextual,Local Retail and Service,R7A,4,5.01,4,2,-,y
-C2-7,Non-contextual,Local Retail and Service,R9,7.52,9.02,10,2,-,y
-C2-7A,Contextual,Local Retail and Service,R9A,7.52,9.02,7.5,2,-,y
-C2-7X,Contextual,Local Retail and Service,R9X,9,10.8,9,2,-,y
-C2-8,Non-contextual,Local Retail and Service,R10,10,12,10,2,-,y
-C2-8A,Contextual,Local Retail and Service,R10A,10,12,10,2,-,y
-C3,Non-contextual,Waterfront Recreation,R3-2,0.75,1,1,0.5,-,y
-C3A,Contextual,Waterfront Recreation,R3-2,0.75,1,1,0.5,-,y
-C4-1,Non-contextual,General Commercial,R5,1.5,2,2,1,-,y
-C4-2,Non-contextual,General Commercial,R6,2.43,3.9,4.8,3.4,-,y
-C4-2A,Contextual,General Commercial,R6A,3,3.9,3,3,-,y
-C4-2F,Non-contextual,General Commercial,R8,6.02,7.2,6.5,3.4,-,y
-C4-3,Non-contextual,General Commercial,R6,2.43,3.9,4.8,3.4,-,y
-C4-3A,Contextual,General Commercial,R6A,3,3.9,3,3,-,y
-C4-4,Non-contextual,General Commercial,R7-2,3.44,5.01,6.5,3.4,-,y
-C4-4A,Contextual,General Commercial,R7A,4,5.01,4,4,-,y
-C4-4D,Contextual,General Commercial,R8A,6.02,7.2,6.5,3.4,-,y
-C4-4L,Contextual,General Commercial,R7A,4,5.01,4,4,-,y
-C4-5,Non-contextual,General Commercial,R7-2,3.44,5.01,6.5,3.4,-,y
-C4-5A,Contextual,General Commercial,R7A,4,5.01,4,4,-,y
-C4-5D,Contextual,General Commercial,R7D,4.66,5.6,4.66,4.2,-,y
-C4-5X,Contextual,General Commercial,R7X,5,6,5,4,-,y
-C4-6,Non-contextual,General Commercial,R10,10,12,10,3.4,-,y
-C4-6A,Contextual,General Commercial,R10A,10,12,10,3.4,-,y
-C4-7,Non-contextual,General Commercial,R10,10,12,10,10,-,y
-C4-7A,Contextual,General Commercial,R10A,10,12,10,10,,y
-C4-11,Non-contextual,General Commercial,R11,12,15,12,3.4,,y
-C4-11A,Contextual,General Commercial,R11A,12,15,12,3.4,,y
-C4-12,Contextual,General Commercial,R12,15,18,15,3.4,,y
-C5-1,Non-contextual,Restricted Central Commercial,R10,10,12,10,4,-,y
-C5-1A,Contextual,Restricted Central Commercial,R10A,10,12,10,4,-,y
-C5-2,Non-contextual,Restricted Central Commercial,R10,10,12,10,10,-,y
-C5-2.5,Non-contextual,Restricted Central Commercial,,10,12,12,12,-,y
-C5-2A,Contextual,Restricted Central Commercial,R10A,10,12,10,10,-,y
-C5-3,Non-contextual,Restricted Central Commercial,R10,10,12,15,15,-,y
-C5-4,Non-contextual,Restricted Central Commercial,R10,10,12,10,10,-,y
-C5-5,Non-contextual,Restricted Central Commercial,R10,10,12,15,15,-,y
-C5-P,Non-contextual,Restricted Central Commercial,R10,10,12,10,8,-,y
-C6-1,Non-contextual,General Central Commercial,R7-2,3.44,5.01,6.5,6,-,y
-C6-1A,Contextual,General Central Commercial,R6,2.43,3.9,6,6,-,y
-C6-1G,Non-contextual,General Central Commercial,R7-2,3.44,5.01,,6,-,y
-C6-2,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,-,y
-C6-2A,Contextual,General Central Commercial,R8A,6.02,7.2,6.5,6,-,y
-C6-2G,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,-,y
-C6-2M,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,-,y
-C6-3,Non-contextual,General Central Commercial,R9,7.52,9.02,10,6,-,y
-C6-3A,Contextual,General Central Commercial,R9A,7.52,9.02,7.5,6,-,y
-C6-3D,Contextual,General Central Commercial,R9D,9,10.8,9,9,-,y
-C6-3X,Contextual,General Central Commercial,R9X,9,10.8,9,6,-,y
-C6-4,Non-contextual,General Central Commercial,R10,10,12,10,10,-,y
-C6-4.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,-,
-C6-4A,Contextual,General Central Commercial,R10A,10,12,10,10,-,y
-C6-4M,Non-contextual,General Central Commercial,R10,10,12,10,10,-,y
-C6-4X,Contextual,General Central Commercial,R10X,10,12,10,10,-,y
-C6-5,Non-contextual,General Central Commercial,R10,10,12,10,10,-,y
-C6-5.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,-,
-C6-6,Non-contextual,General Central Commercial,R10,10,12,15,15,-,y
-C6-6.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,-,
-C6-7,Non-contextual,General Central Commercial,R10,10,12,15,15,-,y
-C6-7T,Non-contextual,Restricted Central Commercial,R10,10,12,14,14,-,y
-C6-8,Non-contextual,General Central Commercial,R10,10,12,10,10,,y
-C6-9,Non-contextual,General Central Commercial,R10,10,12,15,15,-,y
-C6-11,Non-contextual,General Central Commercial,R11,12,15,12,12,,y
-C6-12,Non-contextual,General Central Commercial,R12,15,18,15,15,,y
-C7,Non-contextual,Commercial Amusement,-,-,-,-,2,-,y
-C7-1,Non-contextual,Commercial Amusement,-,-,-,2,2,-,
-C8-1,Non-contextual,General Service,-,-,-,2.4,1,-,y
-C8-2,Non-contextual,General Service,-,-,-,4.8,2,-,y
-C8-3,Non-contextual,General Service,-,-,-,6.5,2,-,y
-C8-4,Non-contextual,General Service,-,-,-,6.5,5,-,y
-M1-1,Non-contextual,Light Manufacturing,,-,-,2.4,1,1,y
+BALL FIELD,-,-,,0,0,0,0,0,
+BPC,-,-,,0,0,0,0,0,y
+C1-6,Non-contextual,Local Retail and Service,R7-2,3.44,5.01,6.5,2,0,y
+C1-6A,Contextual,Local Retail and Service,R7A,4,5.01,4,2,0,y
+C1-7,Non-contextual,Local Retail and Service,R8,6.02,7.2,6.5,2,0,y
+C1-7A,Contextual,Local Retail and Service,R8A,6.02,7.2,6.5,2,0,y
+C1-8,Non-contextual,Local Retail and Service,R9,7.52,9.02,10,2,0,y
+C1-8A,Contextual,Local Retail and Service,R9A,7.52,9.02,7.5,2,0,y
+C1-8X,Contextual,Local Retail and Service,R9X,9,10.8,9,2,0,y
+C1-9,Non-contextual,Local Retail and Service,R10,10,12,10,2,0,y
+C1-9A,Contextual,Local Retail and Service,R10A,10,12,10,2,0,y
+C2-6,Non-contextual,Local Retail and Service,R7-2,3.44,5.01,6.5,2,0,y
+C2-6A,Contextual,Local Retail and Service,R7A,4,5.01,4,2,0,y
+C2-7,Non-contextual,Local Retail and Service,R9,7.52,9.02,10,2,0,y
+C2-7A,Contextual,Local Retail and Service,R9A,7.52,9.02,7.5,2,0,y
+C2-7X,Contextual,Local Retail and Service,R9X,9,10.8,9,2,0,y
+C2-8,Non-contextual,Local Retail and Service,R10,10,12,10,2,0,y
+C2-8A,Contextual,Local Retail and Service,R10A,10,12,10,2,0,y
+C3,Non-contextual,Waterfront Recreation,R3-2,0.75,1,1,0.5,0,y
+C3A,Contextual,Waterfront Recreation,R3-2,0.75,1,1,0.5,0,y
+C4-1,Non-contextual,General Commercial,R5,1.5,2,2,1,0,y
+C4-2,Non-contextual,General Commercial,R6,2.43,3.9,4.8,3.4,0,y
+C4-2A,Contextual,General Commercial,R6A,3,3.9,3,3,0,y
+C4-2F,Non-contextual,General Commercial,R8,6.02,7.2,6.5,3.4,0,y
+C4-3,Non-contextual,General Commercial,R6,2.43,3.9,4.8,3.4,0,y
+C4-3A,Contextual,General Commercial,R6A,3,3.9,3,3,0,y
+C4-4,Non-contextual,General Commercial,R7-2,3.44,5.01,6.5,3.4,0,y
+C4-4A,Contextual,General Commercial,R7A,4,5.01,4,4,0,y
+C4-4D,Contextual,General Commercial,R8A,6.02,7.2,6.5,3.4,0,y
+C4-4L,Contextual,General Commercial,R7A,4,5.01,4,4,0,y
+C4-5,Non-contextual,General Commercial,R7-2,3.44,5.01,6.5,3.4,0,y
+C4-5A,Contextual,General Commercial,R7A,4,5.01,4,4,0,y
+C4-5D,Contextual,General Commercial,R7D,4.66,5.6,4.66,4.2,0,y
+C4-5X,Contextual,General Commercial,R7X,5,6,5,4,0,y
+C4-6,Non-contextual,General Commercial,R10,10,12,10,3.4,0,y
+C4-6A,Contextual,General Commercial,R10A,10,12,10,3.4,0,y
+C4-7,Non-contextual,General Commercial,R10,10,12,10,10,0,y
+C4-7A,Contextual,General Commercial,R10A,10,12,10,10,0,y
+C4-11,Non-contextual,General Commercial,R11,12,15,12,3.4,0,y
+C4-11A,Contextual,General Commercial,R11A,12,15,12,3.4,0,y
+C4-12,Contextual,General Commercial,R12,15,18,15,3.4,0,y
+C5-1,Non-contextual,Restricted Central Commercial,R10,10,12,10,4,0,y
+C5-1A,Contextual,Restricted Central Commercial,R10A,10,12,10,4,0,y
+C5-2,Non-contextual,Restricted Central Commercial,R10,10,12,10,10,0,y
+C5-2.5,Non-contextual,Restricted Central Commercial,,10,12,12,12,0,y
+C5-2A,Contextual,Restricted Central Commercial,R10A,10,12,10,10,0,y
+C5-3,Non-contextual,Restricted Central Commercial,R10,10,12,15,15,0,y
+C5-4,Non-contextual,Restricted Central Commercial,R10,10,12,10,10,0,y
+C5-5,Non-contextual,Restricted Central Commercial,R10,10,12,15,15,0,y
+C5-P,Non-contextual,Restricted Central Commercial,R10,10,12,10,8,0,y
+C6-1,Non-contextual,General Central Commercial,R7-2,3.44,5.01,6.5,6,0,y
+C6-1A,Contextual,General Central Commercial,R6,2.43,3.9,6,6,0,y
+C6-1G,Non-contextual,General Central Commercial,R7-2,3.44,5.01,0,6,0,y
+C6-2,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,0,y
+C6-2A,Contextual,General Central Commercial,R8A,6.02,7.2,6.5,6,0,y
+C6-2G,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,0,y
+C6-2M,Non-contextual,General Central Commercial,R8,6.02,7.2,6.5,6,0,y
+C6-3,Non-contextual,General Central Commercial,R9,7.52,9.02,10,6,0,y
+C6-3A,Contextual,General Central Commercial,R9A,7.52,9.02,7.5,6,0,y
+C6-3D,Contextual,General Central Commercial,R9D,9,10.8,9,9,0,y
+C6-3X,Contextual,General Central Commercial,R9X,9,10.8,9,6,0,y
+C6-4,Non-contextual,General Central Commercial,R10,10,12,10,10,0,y
+C6-4.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,0,
+C6-4A,Contextual,General Central Commercial,R10A,10,12,10,10,0,y
+C6-4M,Non-contextual,General Central Commercial,R10,10,12,10,10,0,y
+C6-4X,Contextual,General Central Commercial,R10X,10,12,10,10,0,y
+C6-5,Non-contextual,General Central Commercial,R10,10,12,10,10,0,y
+C6-5.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,0,
+C6-6,Non-contextual,General Central Commercial,R10,10,12,15,15,0,y
+C6-6.5,Non-contextual,Restricted Central Commercial,R10,10,12,12,12,0,
+C6-7,Non-contextual,General Central Commercial,R10,10,12,15,15,0,y
+C6-7T,Non-contextual,Restricted Central Commercial,R10,10,12,14,14,0,y
+C6-8,Non-contextual,General Central Commercial,R10,10,12,10,10,0,y
+C6-9,Non-contextual,General Central Commercial,R10,10,12,15,15,0,y
+C6-11,Non-contextual,General Central Commercial,R11,12,15,12,12,0,y
+C6-12,Non-contextual,General Central Commercial,R12,15,18,15,15,0,y
+C7,Non-contextual,Commercial Amusement,-,0,0,0,2,0,y
+C7-1,Non-contextual,Commercial Amusement,-,0,0,2,2,0,
+C8-1,Non-contextual,General Service,-,0,0,2.4,1,0,y
+C8-2,Non-contextual,General Service,-,0,0,4.8,2,0,y
+C8-3,Non-contextual,General Service,-,0,0,6.5,2,0,y
+C8-4,Non-contextual,General Service,-,0,0,6.5,5,0,y
+M1-1,Non-contextual,Light Manufacturing,,0,0,2.4,1,1,y
 M1-1/R5,Non-contextual,Mixed Use,,1.5,2,2,1,1,y
 M1-1/R6A,Contextual,Mixed Use,,3,3.9,3,1,1,y
 M1-1/R7-2,Contextual,Mixed Use,,3.44,5.01,6.5,1,1,y
@@ -89,7 +89,7 @@ M1-1/R7D,Contextual,Mixed Use,,4.66,5.6,4.66,1,1,y
 M1-1A/R6B,Contextual,Mixed Use,,2,2.4,2,2,2,
 M1-1A/R7-3,Non-contextual,Mixed Use,,5,6,6.5,2,2,
 M1-1D,Non-contextual,Light Manufacturing,,1.5,2,2.4,1,1,y
-M1-2,Non-contextual,Light Manufacturing,,-,-,4.8,2,2,y
+M1-2,Non-contextual,Light Manufacturing,,0,0,4.8,2,2,y
 M1-2/R5B,Contextual,Mixed Use,,1.5,2,2,2,2,y
 M1-2/R5D,Contextual,Mixed Use,,2,2,2,2,2,y
 M1-2/R6,Non-contextual,Mixed Use,,2.43,3.9,4.8,2,2,y
@@ -100,20 +100,20 @@ M1-2/R7-2,Non-contextual,Mixed Use,,3.44,5.01,6.5,2,2,y
 M1-2/R7A,Contextual,Mixed Use,,4,5.01,4,2,2,y
 M1-2/R8,Non-contextual,Mixed Use,,6.02,7.2,6.5,2,2,y
 M1-2/R8A,Contextual,Mixed Use,,6.02,7.2,6.5,2,2,y
-M1-2A,Contextual,Light Manufacturing,,-,-,3,3,3,
+M1-2A,Contextual,Light Manufacturing,,0,0,3,3,3,
 M1-2A/R6A,Contextual,Mixed Use,,3,3.9,3,3,3,
 M1-2A/R7-2,Contextual,Mixed Use,,3.44,5.01,6.5,3,3,
 M1-2A/R7A,Contextual,Mixed Use,,4,5.01,4,3,3,
 M1-2D,Non-contextual,Light Manufacturing,,1.5,2,4.8,2,2,y
-M1-3,Non-contextual,Light Manufacturing,,-,-,6.5,5,5,y
+M1-3,Non-contextual,Light Manufacturing,,0,0,6.5,5,5,y
 M1-3/R7D,Contextual,Mixed Use,,4.66,5.6,4.66,5,5,
 M1-3/R7X,Contextual,Mixed Use,,5,6,5,5,5,y
 M1-3/R8,Non-contextual,Mixed Use,,6.02,7.2,6.5,5,5,y
-M1-3A,Contextual,Light Manufacturing,,-,-,6.5,4,4,
+M1-3A,Contextual,Light Manufacturing,,0,0,6.5,4,4,
 M1-3A/R7A,Contextual,Mixed Use,,4,5.01,4,4,4,
 M1-3A/R7D,Contextual,Mixed Use,,4.66,5.6,4.66,4,4,
 M1-3A/R7X,Contextual,Mixed Use,,5,6,5,4,4,
-M1-4,Non-contextual,Light Manufacturing,,-,-,6.5,2,2,y
+M1-4,Non-contextual,Light Manufacturing,,0,0,6.5,2,2,y
 M1-4/R6A,Contextual,Mixed Use,,3,3.9,3,2,2,y
 M1-4/R6B,Contextual,Mixed Use,,2,2.4,2,2,2,y
 M1-4/R6,Non-contextual,Mixed Use,,2.43,3.9,4.8,2,2,
@@ -126,11 +126,11 @@ M1-4/R8A,Contextual,Mixed Use,,6.02,7.2,6.5,2,2,y
 M1-4/R9,Non-contextual,Mixed Use,,7.52,9.02,10,2,2,
 M1-4/R9A,Contextual,Mixed Use,,7.52,9.02,7.5,2,2,
 M1-4A/R9A,Contextual,Mixed Use,,7.52,9.02,7.5,5,5,
-M1-4A,Contextual,Light Manufacturing,,-,-,5,5,5,
+M1-4A,Contextual,Light Manufacturing,,0,0,5,5,5,
 M1-4A/R7-2,Contextual,Mixed Use,,3.44,5.01,6.5,5,5,
 M1-4A/R8A,Contextual,Mixed Use,,6.02,7.2,6.5,5,5,
 M1-4D,Non-contextual,Light Manufacturing,,1.5,2,6.5,2,2,y
-M1-5,Non-contextual,Light Manufacturing,,-,-,6.5,5,5,y
+M1-5,Non-contextual,Light Manufacturing,,0,0,6.5,5,5,y
 M1-5/R10,Non-contextual,Mixed Use,,10,12,10,5,5,y
 M1-5/R6A,Contextual,Mixed Use,,3,3.9,3,5,5,
 M1-5/R7-2,Non-contextual,Mixed Use,,3.44,5.01,6.5,5,5,y
@@ -142,16 +142,16 @@ M1-5/R9,Non-contextual,Mixed Use,,7.52,9.02,10,5,5,y
 M1-5/R9-1,Non-contextual,Mixed Use,,9,10.8,10,5,5,y
 M1-5/R9A,Contextual,Mixed Use,,7.52,9.02,7.5,5,5,
 M1-5/R9X,Contextual,Mixed Use,,9,10.8,9,5,5,
-M1-5A,Contextual,Light Manufacturing,,-,-,5,5,5,y
+M1-5A,Contextual,Light Manufacturing,,0,0,5,5,5,y
 M1-5A/R8,Contextual,Light Manufacturing,,6.02,7.2,6.5,5,5,
-M1-5B,Non-contextual,Light Manufacturing,,-,-,6.5,5,5,y
-M1-5M,Non-contextual,Light Manufacturing,,-,-,6.5,5,5,y
-M1-6,Non-contextual,Light Manufacturing,,-,-,10,10,10,y
+M1-5B,Non-contextual,Light Manufacturing,,0,0,6.5,5,5,y
+M1-5M,Non-contextual,Light Manufacturing,,0,0,6.5,5,5,y
+M1-6,Non-contextual,Light Manufacturing,,0,0,10,10,10,y
 M1-6/R10,Non-contextual,Mixed Use,,10,12,10,10,10,y
 M1-6/R8X,Contextual,Mixed Use,,6.02,7.2,6,10,10,
 M1-6/R9,Non-contextual,Mixed Use,,7.52,9.02,10,10,10,y
 M1-6/R9X,Contextual,Mixed Use,,9,10.8,9,10,10,
-M1-6A,Contextual,Light Manufacturing,,-,-,8,8,8,
+M1-6A,Contextual,Light Manufacturing,,0,0,8,8,8,
 M1-6A/R8,Contextual,Mixed Use,,6.02,7.2,6.5,8,8,
 M1-6A/R9,,,,7.52,9.02,10,8,8,
 M1-6A/R9A,,,,7.52,9.02,7.5,8,8,
@@ -160,62 +160,62 @@ M1-6A/R10,,,,10,12,10,8,8,
 M1-6D,Contextual,Mixed Use,,10,12,10,10,10,y
 M1-8A/R11,Contextual,Mixed Use,,12,15,12,12,12,
 M1-8A/R12,Contextual,Mixed Use,,15,18,15,12,12,
-M1-9A,Contextual,Light Manufacturing,,-,-,15,15,15,
+M1-9A,Contextual,Light Manufacturing,,0,0,15,15,15,
 M1-9A/R12,Contextual,Mixed Use,,15,18,15,15,15,
-M2-1,Non-contextual,Medium Manufacturing,,-,-,-,2,2,y
-M2-2,Non-contextual,Medium Manufacturing,,-,-,-,5,5,y
-M2-3,Non-contextual,Medium Manufacturing,,-,-,-,2,2,y
-M2-3A,Contextual,Medium Manufacturing,,-,-,-,4,4,
-M2-4,Non-contextual,Medium Manufacturing,,-,-,-,5,5,y
-M3-1,Non-contextual,Heavy Manufacturing,,-,-,-,2,2,y
-M3-2A,Contextual,Heavy Manufacturing,,-,-,-,3,3,
-M3-2,Non-contextual,Heavy Manufacturing,,-,-,-,2,2,y
-PARK,-,-,,-,-,-,-,-,
-PLAYGROUND,-,-,,-,-,-,-,-,
-PUBLIC PLACE,-,-,,-,-,-,-,-,
-R10,Non-contextual,High-Density Residence District,,10,12,10,-,-,y
-R10A,Contextual,High-Density Residence District,,10,12,10,-,-,y
-R10H,Non-contextual,High-Density Residence District,,10,12,10,,,
-R10X,Non-contextual,High-Density Residence District,,10,12,10,-,-,y
-R1-1,Non-contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R1-2,Non-contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R1-2A,Contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R2,Non-contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R2A,Contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R2X,Contextual,Low-Density Residence District,,1,1,1,-,-,y
-R3-1,Contextual,Low-Density Contextual Residence District,,0.75,1,1,-,-,y
-R3-2,Non-contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R3A,Contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R3X,Contextual,Low-Density Residence District,,0.75,1,1,-,-,y
-R4,Non-contextual,Low-Density Residence District,,1,1.5,2,-,-,y
-R4-1,Contextual,Low-Density Contextual Residence District,,1,1.5,2,-,-,y
-R4A,Contextual,Low-Density Residence District,,1,1.5,2,-,-,y
-R4B,Contextual,Low-Density Residence District,,1,1.5,2,-,-,y
-R5,Non-contextual,Low-Density Residence District,,1.5,2,2,-,-,y
-R5A,Contextual,Low-Density Residence District,,1.5,2,2,-,-,y
-R5B,Contextual,Low-Density Residence District,,1.5,2,2,-,-,y
-R5D,Contextual,Low-Density Residence District,,2,2,2,-,-,y
-R6,Non-contextual,Medium-Density Residence District,,2.43,3.9,4.8,-,-,y
-R6-1,Non-contextual,Medium-Density Residence District,,3,3.9,4.8,-,-,y
-R6-2,Non-contextual,Medium-Density Residence District,,2.5,3,2.5,-,-,y
-R6A,Contextual,Medium-Density Residence District,,3,3.9,3,-,-,y
-R6B,Contextual,Medium-Density Residence District,,2,2.4,2,-,-,y
-R6D,Contextual,Medium-Density Residence District,,2.5,3,2.5,-,-,y
-R7-1,Non-contextual,Medium-Density Residence District,,3.44,5.01,4.8,-,-,y
-R7-2,Non-contextual,Medium-Density Residence District,,3.44,5.01,6.5,-,-,y
-R7-3,Non-contextual,Medium-Density Residence District,,5,6,6.5,-,-,y
-R7A,Contextual,Medium-Density Residence District,,4,5.01,4,-,-,y
-R7B,Contextual,Medium-Density Residence District,,3,3.9,3,-,-,y
-R7D,Contextual,Medium-Density Residence District,,4.66,5.6,4.66,-,-,y
-R7X,Contextual,Medium-Density Residence District,,5,6,5,-,-,y
-R8,Non-contextual,High-Density Residence District,,6.02,7.2,6.5,-,-,y
-R8A,Contextual,Medium-Density Residence District,,6.02,7.2,6.5,-,-,y
-R8B,Contextual,Medium-Density Residence District,,4,4.8,4,-,-,y
-R8X,Contextual,Medium-Density Residence District,,6.02,7.2,6,-,-,y
-R9,Non-contextual,High-Density Residence District,,7.52,9.02,10,-,-,y
-R9-1,Non-contextual,High-Density Residence District,,9,10.8,10,-,-,y
-R9A,Contextual,High-Density Residence District,,7.52,9.02,7.5,-,-,y
-R9X,Contextual,High-Density Residence District,,9,10.8,9,-,-,y
-R11,Non-contextual,High-Density Residence District,,12,15,12,,,y
-R11A,Contextual,High-Density Residence District,,12,15,12,,,y
-R12,Non-contextual,High-Density Residence District,,15,18,15,,,y
+M2-1,Non-contextual,Medium Manufacturing,,0,0,0,2,2,y
+M2-2,Non-contextual,Medium Manufacturing,,0,0,0,5,5,y
+M2-3,Non-contextual,Medium Manufacturing,,0,0,0,2,2,y
+M2-3A,Contextual,Medium Manufacturing,,0,0,0,4,4,
+M2-4,Non-contextual,Medium Manufacturing,,0,0,0,5,5,y
+M3-1,Non-contextual,Heavy Manufacturing,,0,0,0,2,2,y
+M3-2A,Contextual,Heavy Manufacturing,,0,0,0,3,3,
+M3-2,Non-contextual,Heavy Manufacturing,,0,0,0,2,2,y
+PARK,-,-,,0,0,0,0,0,
+PLAYGROUND,-,-,,0,0,0,0,0,
+PUBLIC PLACE,-,-,,0,0,0,0,0,
+R10,Non-contextual,High-Density Residence District,,10,12,10,0,0,y
+R10A,Contextual,High-Density Residence District,,10,12,10,0,0,y
+R10H,Non-contextual,High-Density Residence District,,10,12,10,0,0,
+R10X,Non-contextual,High-Density Residence District,,10,12,10,0,0,y
+R1-1,Non-contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R1-2,Non-contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R1-2A,Contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R2,Non-contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R2A,Contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R2X,Contextual,Low-Density Residence District,,1,1,1,0,0,y
+R3-1,Contextual,Low-Density Contextual Residence District,,0.75,1,1,0,0,y
+R3-2,Non-contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R3A,Contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R3X,Contextual,Low-Density Residence District,,0.75,1,1,0,0,y
+R4,Non-contextual,Low-Density Residence District,,1,1.5,2,0,0,y
+R4-1,Contextual,Low-Density Contextual Residence District,,1,1.5,2,0,0,y
+R4A,Contextual,Low-Density Residence District,,1,1.5,2,0,0,y
+R4B,Contextual,Low-Density Residence District,,1,1.5,2,0,0,y
+R5,Non-contextual,Low-Density Residence District,,1.5,2,2,0,0,y
+R5A,Contextual,Low-Density Residence District,,1.5,2,2,0,0,y
+R5B,Contextual,Low-Density Residence District,,1.5,2,2,0,0,y
+R5D,Contextual,Low-Density Residence District,,2,2,2,0,0,y
+R6,Non-contextual,Medium-Density Residence District,,2.43,3.9,4.8,0,0,y
+R6-1,Non-contextual,Medium-Density Residence District,,3,3.9,4.8,0,0,y
+R6-2,Non-contextual,Medium-Density Residence District,,2.5,3,2.5,0,0,y
+R6A,Contextual,Medium-Density Residence District,,3,3.9,3,0,0,y
+R6B,Contextual,Medium-Density Residence District,,2,2.4,2,0,0,y
+R6D,Contextual,Medium-Density Residence District,,2.5,3,2.5,0,0,y
+R7-1,Non-contextual,Medium-Density Residence District,,3.44,5.01,4.8,0,0,y
+R7-2,Non-contextual,Medium-Density Residence District,,3.44,5.01,6.5,0,0,y
+R7-3,Non-contextual,Medium-Density Residence District,,5,6,6.5,0,0,y
+R7A,Contextual,Medium-Density Residence District,,4,5.01,4,0,0,y
+R7B,Contextual,Medium-Density Residence District,,3,3.9,3,0,0,y
+R7D,Contextual,Medium-Density Residence District,,4.66,5.6,4.66,0,0,y
+R7X,Contextual,Medium-Density Residence District,,5,6,5,0,0,y
+R8,Non-contextual,High-Density Residence District,,6.02,7.2,6.5,0,0,y
+R8A,Contextual,Medium-Density Residence District,,6.02,7.2,6.5,0,0,y
+R8B,Contextual,Medium-Density Residence District,,4,4.8,4,0,0,y
+R8X,Contextual,Medium-Density Residence District,,6.02,7.2,6,0,0,y
+R9,Non-contextual,High-Density Residence District,,7.52,9.02,10,0,0,y
+R9-1,Non-contextual,High-Density Residence District,,9,10.8,10,0,0,y
+R9A,Contextual,High-Density Residence District,,7.52,9.02,7.5,0,0,y
+R9X,Contextual,High-Density Residence District,,9,10.8,9,0,0,y
+R11,Non-contextual,High-Density Residence District,,12,15,12,0,0,y
+R11A,Contextual,High-Density Residence District,,12,15,12,0,0,y
+R12,Non-contextual,High-Density Residence District,,15,18,15,0,0,y
\ No newline at end of file
diff --git a/products/pluto/pluto_build/sql/far.sql b/products/pluto/pluto_build/sql/far.sql
index 5af0d45c49..1c3769118d 100644
--- a/products/pluto/pluto_build/sql/far.sql
+++ b/products/pluto/pluto_build/sql/far.sql
@@ -8,88 +8,9 @@ WHERE lotarea != '0' AND lotarea IS NOT NULL;
 -- base on zoning district 1
 UPDATE pluto a
 SET
-    residfar = b.residfar,
-    commfar = b.commfar,
-    facilfar = b.facilfar
-FROM dcp_zoning_maxfar AS b
-WHERE a.zonedist1 = b.zonedist;
--- zoning district 1 with / first p art 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist1, '/', 1) = b.zonedist;
-
--- zoning district 1 with / second part 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist1, '/', 2) = b.zonedist;
-
--- base on zoning district 2
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE a.zonedist2 = b.zonedist;
-
--- zoning district 2 with / first part 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist2, '/', 1) = b.zonedist;
-
--- zoning district 2 with / second part 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist2, '/', 2) = b.zonedist;
-
--- base on zoning district 3
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE a.zonedist3 = b.zonedist;
-
--- zoning district 3 with / first part 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist3, '/', 1) = b.zonedist;
-
--- zoning district 3 with / second part 
-UPDATE pluto a
-SET
-    residfar = (coalesce(a.residfar, b.residfar)),
-    commfar = (coalesce(a.commfar, b.commfar)),
-    facilfar = (coalesce(a.facilfar, b.facilfar))
-FROM dcp_zoning_maxfar AS b
-WHERE split_part(a.zonedist3, '/', 2) = b.zonedist;
-
--- make NULLs zeros and make values numeric
-UPDATE pluto a
-SET
-    residfar
-    = (CASE WHEN a.residfar IS NULL OR a.residfar = '-' THEN 0::double precision ELSE a.residfar::double precision END),
-    commfar
-    = (CASE WHEN a.commfar IS NULL OR a.commfar = '-' THEN 0::double precision ELSE a.commfar::double precision END),
-    facilfar = (CASE WHEN a.facilfar IS NULL OR a.facilfar = '-' THEN 0 ELSE a.facilfar::double precision END);
+    residfar = coalesce(b.residfar::double precision, 0::double precision),
+    commfar = coalesce(b.commfar::double precision, 0::double precision),
+    facilfar = coalesce(b.facilfar::double precision, 0::double precision)
+FROM pluto AS p
+LEFT JOIN dcp_zoning_maxfar AS b ON p.zonedist1 = b.zonedist
+WHERE a.bbl = p.bbl;