Update for CO2Emission
updates to CO2Emission
test merge update controller
changes
Merging conflicts on controller update
merge conflict updates