new roles are adding to the list of all roles, code formatted better