New version (final?).