Make bad fire not be text + more code separation