Added faster session switching