Updated shutdown path