changed to session vars