added json file and one optimization