Final version before merge.