changed into new json serialization
changed into new json serialization