after the first session
merge initial code