one last revert on the role definitions