New JSON, updating more code