Updates to panic feature