Revert "Revert "changed on boundary changes""

This reverts commit 6ec72573a943cb1f9e901fee15022ad7ccc4789c.