Roles were improved. Part 2.