Rebuild with acknowledgements