finish json rework