added some session stuff to test on windows