adding some feature into the master