Started to make the json more accurate