Updated panic feature