changed the codes based on session subject