Added save & restore when no internet is available