Revised pickRoles