Much improved shutdown experience