refactor fire for check