Lots of changes to do the batch updates