Reverted to ec91804
Much smarter. Avoids common problems in .csv file