batch_expand added