Simplify new master selection