Update for arXiv branch