More engineering for shutdown