continue json refactor