Switched from localstorage to Storage