Switched to json saving