adding all new changes with brand new login system