modified logout, again