added back in simple replacements