diff --git a/new_targets/procs/get_option_costs_priceg.pg.sql b/new_targets/procs/get_option_costs_priceg.pg.sql
index ddef636..4ddb5db 100644
--- a/new_targets/procs/get_option_costs_priceg.pg.sql
+++ b/new_targets/procs/get_option_costs_priceg.pg.sql
@@ -77,7 +77,7 @@ SELECT
     ,sel.avgfc
     ,sel.avgwt
     ,t.price
-    ,round(CASE WHEN coalesce(t.price,0) <> 0 THEN (t.price-COALESCE(sel.avgfc,0))/t.price ELSE 0 END,3) futmarg
+    ,round(CASE WHEN coalesce(t.price,0) <> 0 THEN (t.price-COALESCE(sel.avgsc,0))/t.price ELSE 0 END,3) curmarg
 FROM 
     sel 
     LEFT OUTER JOIN pricequote.target_prices t ON 
diff --git a/new_targets/scripts/matrix_guidance.pg.sql b/new_targets/scripts/matrix_guidance.pg.sql
index 176bbfd..8f999bf 100644
--- a/new_targets/scripts/matrix_guidance.pg.sql
+++ b/new_targets/scripts/matrix_guidance.pg.sql
@@ -179,7 +179,7 @@ BEGIN
     FROM pricequote.lastprice lp
     WHERE 
         lp.customer = q.cust
-        AND lp.partgroup = SUBSTRING(q.part, 1, 8);
+        AND lp.partgroup = q.partgroup;
 
     -----------------------------------------------------------------------
     -- Step 5: Resolve best list price and insert it with list code