take care of session storage as well