Updated the functions to read the correct data sets