added & reorganized json form