uncommented added session codes