added partial replace