not done
merged session time management