Some string manipulation changes I am moving to my other workstation