Changed info to only use one json