use new Roles subsystem
link tweaks
Case matters