New architecture allowing manual shutdown