fixing json after refactoring