Rearranged some roles