made changes to how roles are assigned
staging merge