More work done on session viewing