block6 changes
merge