fix session & add analysis