Some changes to master/interface