I could move this into the shutdown. Maybe that would be more useful for others too.