Shutdown working even better