Merge into nearly final form