COnflagration: More changes.