Working drive authorization -- amend