Working on authority
Merged