Better shutdown order, there is still an issue with interleaving when Diamond shuts down