simplified disaster model
Incorporated update to disaster_model from disasters branch