working on new authorization scheme