Removed isLoggedIn check