fix json
rename json keys
first implementation