Attempt Fix to adapt to new data structure