added rest of save for Json