More changes, added JSON file