made changes to account for new json structure