changed so it works for first time users with redirect