Improved shutdown speed