updated json still needs more work