Revert "Revert "json update""

This reverts commit e397b9ab3574a411aeaca316874f16cc87afcaa8.