incorporated initial changes for WildFire