delimiter parsing loop changed to while'