modified to include json files