diff --git a/src/model/resources/vre_stor/vre_stor.jl b/src/model/resources/vre_stor/vre_stor.jl
index 6ddeca045b..b5eb11ecd7 100644
--- a/src/model/resources/vre_stor/vre_stor.jl
+++ b/src/model/resources/vre_stor/vre_stor.jl
@@ -2034,28 +2034,28 @@ function vre_stor_capres!(EP::Model, inputs::Dict, setup::Dict)
 
     #Variable costs of DC "virtual charging" for technologies "y" during hour "t" in zone "z"
     @expression(EP, eCVar_Charge_DC_virtual[y in DC_CHARGE,t=1:T],
-        inputs["omega"][t]*by_rid(y,:Var_OM_Cost_per_MWh_Charge_DC)*vCAPRES_DC_CHARGE[y,t]/by_rid(y,:EtaInverter))
+        inputs["omega"][t]*setup["VirtualCHargeDischargeCost"]*vCAPRES_DC_CHARGE[y,t]/by_rid(y,:EtaInverter))
     @expression(EP, eTotalCVar_Charge_DC_T_virtual[t=1:T], sum(eCVar_Charge_DC_virtual[y,t] for y in DC_CHARGE))
     @expression(EP, eTotalCVar_Charge_DC_virtual, sum(eTotalCVar_Charge_DC_T_virtual[t] for t in 1:T))
     EP[:eObj] += eTotalCVar_Charge_DC_virtual
 
     #Variable costs of DC "virtual discharging" for technologies "y" during hour "t" in zone "z"
     @expression(EP, eCVar_Discharge_DC_virtual[y in DC_DISCHARGE,t=1:T],
-        inputs["omega"][t]*by_rid(y,:Var_OM_Cost_per_MWh_Discharge_DC)*by_rid(y,:EtaInverter)*vCAPRES_DC_DISCHARGE[y,t])
+        inputs["omega"][t]*setup["VirtualCHargeDischargeCost"]*by_rid(y,:EtaInverter)*vCAPRES_DC_DISCHARGE[y,t])
     @expression(EP, eTotalCVar_Discharge_DC_T_virtual[t=1:T], sum(eCVar_Discharge_DC_virtual[y,t] for y in DC_DISCHARGE))
     @expression(EP, eTotalCVar_Discharge_DC_virtual, sum(eTotalCVar_Discharge_DC_T_virtual[t] for t in 1:T))
     EP[:eObj] += eTotalCVar_Discharge_DC_virtual
 
     #Variable costs of AC "virtual charging" for technologies "y" during hour "t" in zone "z"
     @expression(EP, eCVar_Charge_AC_virtual[y in AC_CHARGE,t=1:T],
-        inputs["omega"][t]*by_rid(y,:Var_OM_Cost_per_MWh_Charge_AC)*vCAPRES_AC_CHARGE[y,t])
+        inputs["omega"][t]*setup["VirtualCHargeDischargeCost"]*vCAPRES_AC_CHARGE[y,t])
     @expression(EP, eTotalCVar_Charge_AC_T_virtual[t=1:T], sum(eCVar_Charge_AC_virtual[y,t] for y in AC_CHARGE))
     @expression(EP, eTotalCVar_Charge_AC_virtual, sum(eTotalCVar_Charge_AC_T_virtual[t] for t in 1:T))
     EP[:eObj] += eTotalCVar_Charge_AC_virtual
 
     #Variable costs of AC "virtual discharging" for technologies "y" during hour "t" in zone "z"
     @expression(EP, eCVar_Discharge_AC_virtual[y in AC_DISCHARGE,t=1:T],
-        inputs["omega"][t]*by_rid(y,:Var_OM_Cost_per_MWh_Discharge_AC)*vCAPRES_AC_DISCHARGE[y,t])
+        inputs["omega"][t]*setup["VirtualCHargeDischargeCost"]*vCAPRES_AC_DISCHARGE[y,t])
     @expression(EP, eTotalCVar_Discharge_AC_T_virtual[t=1:T], sum(eCVar_Discharge_AC_virtual[y,t] for y in AC_DISCHARGE))
     @expression(EP, eTotalCVar_Discharge_AC_virtual, sum(eTotalCVar_Discharge_AC_T_virtual[t] for t in 1:T))
     EP[:eObj] += eTotalCVar_Discharge_AC_virtual