Updated JSON

WIP - Sending to Emmanuel to double-check