Changed to session storage