tentatively fixed session. requires testing