 			FROM supply.ego_dp_res_powerplant
 			WHERE scenario in ('eGo 100')
 			AND generation_type not in ('gas')
-			AND version = 'v0.4.4'
+			--AND version = 'v0.4.4'
 			AND flag in ('commissioning', 'repowering')
 			Group BY id
 			Order by id)
 		 AND scenario in ('eGo 100')
-		 And preversion = 'v0.3.0'
-		 AND version = 'v0.4.4'
+		 --And preversion = 'v0.3.0'
+		 --AND version = 'v0.4.4'
 		 AND electrical_capacity > 0
 		 ORDER BY id	
 	) sub2

			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

			SELECT id
			FROM supply.ego_dp_res_powerplant
			WHERE scenario in ('NEP 2035')
			--AND version = 'v0.4.4'
			AND generation_type not in ('biomass','gas','reservoir','run_of_river')
			AND flag in ('commissioning', 'repowering')
			AND generation_subtype not in ('wind_offshore')
			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	
	) sub3
