some changes
loggedIn future added