Update to handle new roles, random other bits.