changes in string parsing