Skip to content

Add more industry data #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
euronion merged 32 commits into from
May 19, 2025
Merged

Add more industry data #211

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
bb80783
separate traditional DRI and hydrogen-based DRI
danielelerede-oet Apr 15, 2025
4d298eb
add BF-BOF technology
danielelerede-oet Apr 15, 2025
22e8a30
restore decimal digits for iron-air batter
danielelerede-oet Apr 15, 2025
e04375c
add ethanol and cement production technologies
danielelerede-oet Apr 16, 2025
9ebfdfa
update release notes
danielelerede-oet Apr 16, 2025
dda18d7
add scrap input for EAF
danielelerede-oet Apr 17, 2025
61e84e9
fix steel data, change unit for VOM and add CO2 intensity bioethanol …
danielelerede-oet May 7, 2025
981daf1
fix MWh capital letters
danielelerede-oet May 7, 2025
40017c3
uniform investment values for industry to EUR/capacity/h
danielelerede-oet May 7, 2025
3c4fc4b
run compile_cost_assumptions
danielelerede-oet May 7, 2025
79c13bf
correct data and units for ethanol
danielelerede-oet May 8, 2025
a305160
merge changes in master branch
danielelerede-oet May 14, 2025
0dd484f
add explanation on direct iron reduction name changes and modify name…
danielelerede-oet May 14, 2025
b9c8f37
review CO2 intensity bioethanol crops
danielelerede-oet May 14, 2025
aa0815a
review steel data
danielelerede-oet May 14, 2025
ba7434e
review source of ethanol and cement data
danielelerede-oet May 14, 2025
8f4d076
Update inputs/manual_input.csv
danielelerede-oet May 14, 2025
cc9ee07
Update JRC file name
danielelerede-oet May 14, 2025
244aa45
corrections
danielelerede-oet May 14, 2025
923c110
update reference year for new technologies
danielelerede-oet May 14, 2025
49c3b1d
corrections on energy inputs for cement and clinker
danielelerede-oet May 14, 2025
6d0ece0
Update details on cement finishing inputs
danielelerede-oet May 15, 2025
6a25fd5
Update dry clinker reference year, investment and source details
danielelerede-oet May 15, 2025
53d093c
update fixom for ethanol production
danielelerede-oet May 15, 2025
b3885b1
update cost values ethanol and details on sources
danielelerede-oet May 15, 2025
2bbc94f
update cement inputs
danielelerede-oet May 15, 2025
c7cfb7c
update cement finishing slag input
danielelerede-oet May 15, 2025
5a1ce51
Merge branch 'master' into add_more_industry_data
danielelerede-oet May 15, 2025
1b62349
update ethanol costs and currency year for JRC
danielelerede-oet May 15, 2025
d3f6850
Add source information on details (stochimetry, currency year)
euronion May 15, 2025
e650d7b
fix further description bug on ethanol production technologies
danielelerede-oet May 16, 2025
bc30c18
correct name electric arc furnace with hbi and scrap
danielelerede-oet May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ Upcoming Release

* Add BF-BOF and separate natural gas- and hydrogen-based steelmaking (The technology previously called `direct iron reduction furnace` becomes `hydrogen direct iron reduction`, and `natural gas direct iron reduction furnace` represent the conventional direct iron reduction process), cement and ethanol production technologies (https://github.com/PyPSA/technology-data/pull/211)

* Add industrial plant CCS retrofit options (https://github.com/PyPSA/technology-data/pull/212)

* Include further unit tests for compile_cost_assumptions.py (https://github.com/PyPSA/technology-data/pull/210)

`v0.11.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.11.0>`__ (24th January 2025)
Expand Down
65 changes: 50 additions & 15 deletions inputs/manual_input.csv
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 30 additions & 12 deletions outputs/US/costs_2020.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3590,17 +3590,24 @@ cement capture,heat-input,0.833,MWh/tCO2,"Danish Energy Agency, inputs/technolog
cement capture,heat-output,1.65,MWh/tCO2,"Danish Energy Agency, inputs/technology_data_for_carbon_capture_transport_storage.xlsx",401.c Post comb - Cement kiln,2020.0,,
cement capture,investment,3000000.0,EUR/(tCO2/h),"Danish Energy Agency, inputs/technology_data_for_carbon_capture_transport_storage.xlsx",401.c Post comb - Cement kiln,2020.0,,
cement capture,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_carbon_capture_transport_storage.xlsx",401.c Post comb - Cement kiln,2020.0,,
cement carbon capture retrofit,FOM,7.0,%/year,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",,2019.0,,
cement carbon capture retrofit,capture_rate,0.9,per unit,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",CO2 volume captured / (Stream flowrate * Max. capacity utilization * CO2 in exhaust * 8760),2019.0,,
cement carbon capture retrofit,electricity-input,0.16,MWh/tCO2,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",,2019.0,,
cement carbon capture retrofit,gas-input,0.76,MWh/tCO2,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",,2019.0,,
cement carbon capture retrofit,investment,2608428.9904,USD/(tCO2/h),"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 247 million USD, CO2 Volume captured 842000 t/year",2019.0,,
cement carbon capture retrofit,lifetime,20.0,years,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",,2019.0,,
cement dry clinker,FOM,4.0,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement dry clinker,VOM,5.0,EUR/t_clinker,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement dry clinker,electricity-input,0.0069,MWh_el/t_clinker,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement dry clinker,gas-input,0.0002,MWh_NG/t_clinker,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement dry clinker,heat-input,0.9944,MWh_th/t_CO2,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement dry clinker,investment,14269.0,EUR/t_clinker/h,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",Original value 125 EUR/t/year,2020.0,,
cement dry clinker,electricity-input,0.0694,MWh_el/t_clinker,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",Original values 0.25 PJ per Mt clinker,2020.0,,
cement dry clinker,gas-input,0.0002,MWh_NG/t_clinker,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",Original values 0.0058 PJ per Mt clinker,2020.0,,
cement dry clinker,heat-input,0.9444,MWh_th/t_CO2,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",Original values 3.4 PJ per Mt clinker,2020.0,,
cement dry clinker,investment,1095000.0,EUR/t_clinker/h,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",Original value 125 EUR/t/year,2020.0,,
cement dry clinker,lifetime,30.0,years,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx`, Sheet `IND` (ICMDRYPRD01, ICM.Dry Process Production.01)",,2020.0,,
cement finishing,FOM,30.0,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
cement finishing,VOM,3.0,EUR/t_cement,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
cement finishing,clinker-input,0.7717,t_cl/t_cement,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx`, Sheet `Input` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
cement finishing,electricity-input,0.2043,MWh_el/t_cement,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx`, Sheet `Input` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
cement finishing,FOM,30.0,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",,2020.0,,
cement finishing,VOM,3.0,EUR/t_cement,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",,2020.0,,
cement finishing,clinker-input,0.194,"t_cl/t_cement; and
t_slag/t_cement","JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx`, Sheet `IND_Trans` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
cement finishing,electricity-input,0.1736,MWh_el/t_cement,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx`, Sheet `IND_Trans` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer) with original value 0.6251 PJ per Mt cement.,2020.0,,
cement finishing,investment,87600.0,EUR/t_cement/h,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",Original value 10 EUR/t/year,2020.0,,
cement finishing,lifetime,25.0,years,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` (ICMFINPRO01, Cement finishing)",Based on inputs for DE (major EU producer),2020.0,,
central air-sourced heat pump,FOM,0.2102,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","40 Comp. hp, airsource 3 MW: Fixed O&M",2015.0,,
Expand Down Expand Up @@ -3903,15 +3910,26 @@ electrolysis small,efficiency,0.5773,per unit,"Danish Energy Agency, inputs/data
electrolysis small,efficiency-heat,0.2762,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",86 AEC 10 MW: - hereof recoverable for district heating,2020.0,,
electrolysis small,investment,1900.0,EUR/kW_e,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",86 AEC 10 MW: Specific investment,2020.0,,
electrolysis small,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",86 AEC 10 MW: Technical lifetime of plant,2020.0,,
ethanol from starch crop,FOM,14.0,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )",Suited for USA and European production,2020.0,,
ethanol carbon capture retrofit,FOM,7.0,%/year,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",,2019.0,,
ethanol carbon capture retrofit,capture_rate,0.94,per unit,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-16, accessed 2025-04-16",,2019.0,,
ethanol carbon capture retrofit,electricity-input,0.12,MWh/tCO2,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-20, accessed 2025-04-16",,2019.0,,
ethanol carbon capture retrofit,investment,935988.2129,USD/(tCO2/h),"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-18, accessed 2025-04-16","Capital cost 36 million USD, CO2 Volume captured 342000 t/year",2019.0,,
ethanol carbon capture retrofit,lifetime,20.0,years,"National Petroleum Council, Meeting the Dual Challenge - A Roadmap to At-Scale Deployment of Carbon Capture, Use, and Storage: https://dualchallenge.npc.org/files/CCUS-Chap_2-030521.pdf, p2-21, accessed 2025-04-16",,2019.0,,
ethanol from starch crop,FOM,13.8,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )","Suited for USA and European production, original values 93.66192 FIXOM and 819.6322825 INVCOST~2020; and
Suited for USA and European production, original values 93.66192 FIXOM and 677.0875 INVCOST~2020; and
Suited for USA and European production, original values 93.66192 FIXOM and 614.7242 INVCOST~2020; and
Suited for USA and European production, original values 93.66192 FIXOM and 570.1790 INVCOST~2030",2020.0,,
ethanol from starch crop,VOM,24.9,EUR/MWh_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )",Suited for USA and European production,2020.0,,
ethanol from starch crop,efficiency,0.58,p.u.,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )","Suited for USA and European production. Converted from 0.35 t_crop/t_eth, LHV_crop = 16.1 GJ/t, LHV_ethanol = 26.7 GJ/t",2020.0,,
ethanol from starch crop,investment,677.0,EUR/MW_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )",Suited for USA and European production.,2020.0,,
ethanol from starch crop,investment,677.09,EUR/MW_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )",Suited for USA and European production,2020.0,,
ethanol from starch crop,lifetime,20.0,years,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH101, Ethanol production from starch crops )",Suited for USA and European production,2020.0,,
ethanol from sugar crops,FOM,16.0,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )",Suited for Brazilian production,2020.0,,
ethanol from sugar crops,FOM,16.43,%/year,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )","Suited for Brazilian production, original values 82.30896 FIXOM and 659.325843 INVCOST~2010; and
Suited for Brazilian production, original values 82.30896 FIXOM and 501.0876 INVCOST~2020; and
Suited for Brazilian production, original values 82.30896 FIXOM and 454.9348 INVCOST~2025; and
Suited for Brazilian production, original values 82.30896 FIXOM and 421.9685 INVCOST~2030",2020.0,,
ethanol from sugar crops,VOM,21.9,EUR/MWh_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )",Suited for Brazilian production,2020.0,,
ethanol from sugar crops,efficiency,0.45,p.u.,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )","Suited for Brazilian production. Converted from 0.292 t_crop/t_eth, LHV_crop = 16.1 GJ/t, LHV_ethanol = 26.7 GJ/t",2020.0,,
ethanol from sugar crops,investment,501.0,EUR/MW_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )",Suited for Brazilian production.,2020.0,,
ethanol from sugar crops,investment,501.09,EUR/MW_eth,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )",Suited for Brazilian production.,2020.0,,
ethanol from sugar crops,lifetime,20.0,years,"JRC, 01_JRC-EU-TIMES Full model, https://zenodo.org/records/3544900, file `SubRES_10_TECHS_CHP_SUP_IND.xlsx` and `SubRES_10_TECHS_CHP_SUP_IND_Trans.xlsx` (BCRPETH201, Ethanol production from sugar crops )",Suited for Brazilian production,2020.0,,
fuel cell,FOM,5.0,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",12 LT-PEMFC CHP: Fixed O&M,2015.0,,
fuel cell,c_b,1.25,50oC/100oC,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",12 LT-PEMFC CHP: Cb coefficient,2015.0,,
Expand Down
Loading