Now uses only json data