Resubmission: Major update.