A few changes to keep up with the new data format. Still missing
responses