take out New-prefix and implement with_replacement switch