add some more nuking to the official patch