Revert "Revert "block changes""

This reverts commit 9dbe61478ad40ee10eef4b2cf1f2baae4f05da11.