Added a better delimiter detection, old one didnt really owork