Trying to fix last min issues with the json