added combustion
merging