Updated with ext and logout