fire seems to be resolved but naming needs to be reconsidered