replace everything that for some reason was deleted
replace missing
Merge pull request #728 from LucidCrux/replace_everything

!URGENT! Replace everything
fix weirdness and missingness