master commit 6