Changed Authorization flow to increase efficiency