Some changes to MASTER
Some more to MASTER