more hacking on session unification