Fixed regexp
Tweaked sessions