Enhancement #3 attempt. Little buggy session behaviour.