changed into new json serialization