Added new version of getting the data