Changes for logout