Still fixing json