changed to return inside shutdown message