Updates to make replacements much wider, for extra hilarity