Better design for surge