Changes to work with correctly exported csv files