Added some shutdowns