some improvement for session 3.