patching in nerdyworm's changes