moved the rest of persistence to Safe