more master changes