Remake for fire demo