[CHANGE] added master var, so only propagates if not master;