Updated Shutdown