Switch to more master based tree