Without S3, almost final