Updated SearchAndReplace