Andrew: changes to session.java structure