Updates to panic functionality