expandBucket is simplified