- Added timed-out shutdown