Completed 'find and replace' from _s to _s2