added session to improve performance