added session support
merge