added session support which is quiker