     AND   capacity > 0 
     AND   fuel not in ('hydro', 'run_of_river', 'reservoir')
     AND   (shutdown IS NULL or shutdown >= 2034)
-    AND   preversion = 'v0.3.0'
-    AND version = 'v0.4.4';
+    --AND   preversion = 'v0.3.0'
+    --AND version = 'v0.4.4';
 
 ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview
     OWNER TO oeuser;

    WHERE scenario = 'Status Quo'
    AND (shutdown IS NULL or shutdown >= 2015)
    AND capacity > 0 
    AND preversion = 'v0.3.0'
    AND version = 'v0.4.4';

ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview
    OWNER TO oeuser; 

			SELECT id
			FROM supply.ego_dp_res_powerplant
			WHERE scenario in ('NEP 2035')
			--AND version = 'v0.4.4'
			Group BY id
			Order by id)
		 AND scenario in ('NEP 2035')
		-- And preversion = 'v0.3.0'
		-- AND version = 'v0.4.4'
		 AND electrical_capacity > 0
		 ORDER BY id	
	) sub2
