Better naming
Add old/new session distinction, fixes bug for messages stacking up