Move to localstorage for FF users