json refactor contd