Refactor roles2

Try two