Moved SessionCounterListener
And I redid the change