remove duplicated part
add session info