Update 2 to use new bucket/block design