rethink session setup