a few changes as we are receiving JSON from the real client now