working on session state
updated more