add first session handling