replaced master with flat