changed CSV parser