more master feature changes