Many updates for new paper