Some work on supporting different sessions.