cookie support, 2 commits