improve session init