Needs to fix the CSV issue