Some changes with the Master