Made a few changes
Working json