Usability upgrade, now using session