complete json overhaul