resolved first responder issues