changed string parsing