0.3 - Sessions reacting only on the selected url & refactoring code