Revert "Revert "+ backup data""

This reverts commit 1c298ed12e4de19a66704b0bf2413c87037bb02c.