Updated for json compatability...